Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Apr 2011 06:44:06 +0000 (23:44 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Apr 2011 06:44:06 +0000 (23:44 -0700)
commit86ef5fbbc685af2511b7920f3a4c7840bc10732f
tree7dc4004321e2115e16ade2b74718cdbcf10b8ffa
parent61cd9e6f1ad018c800e3679d99c8eceee98a5bbe
parenta77275d895708970b7e3d45dad1b7c0d67ea848f
Merge from mainline.
src/ChangeLog
src/xdisp.c